From e143102ea2d17d828aa536d0f3b2723d4a38c2ab Mon Sep 17 00:00:00 2001 From: "vh249@arcadians.cl.cam.ac.uk" Date: Fri, 1 Apr 2005 16:50:25 +0000 Subject: [PATCH] bitkeeper revision 1.1236.53.1 (424d7bd1NXn4oTBcD8LpLpWSaFGwyw) exporting full device now works Signed-off-by: Vincent Hanquez --- linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c | 3 +-- linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c | 9 --------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c index 99ef532760..b4ce612a1b 100644 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c @@ -225,8 +225,7 @@ int blkif_release(struct inode *inode, struct file *filep) int blkif_ioctl(struct inode *inode, struct file *filep, unsigned command, unsigned long argument) { - int i; - /* struct gendisk *gd = inode->i_bdev->bd_disk; */ + int i; DPRINTK_IOCTL("command: 0x%x, argument: 0x%lx, dev: 0x%04x\n", command, (long)argument, inode->i_rdev); diff --git a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c index 0d335a03ba..d2a1f1f65e 100644 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c @@ -338,8 +338,6 @@ static int xlvbd_device_add(struct list_head *list, vdisk_t *disk) if ( !bd ) goto out; - down(&bd->bd_sem); - gd = xlvbd_alloc_gendisk(mi, minor, disk); if ( !gd ) goto out_bd; @@ -365,7 +363,6 @@ static int xlvbd_device_add(struct list_head *list, vdisk_t *disk) list_add(&new->list, list); out_bd: - up(&bd->bd_sem); bdput(bd); out: return 0; @@ -385,8 +382,6 @@ static int xlvbd_device_del(struct lvdisk *disk) if ( !bd ) return -1; - down(&bd->bd_sem); - gd = get_gendisk(device, &unused); di = gd->private_data; @@ -400,7 +395,6 @@ static int xlvbd_device_del(struct lvdisk *disk) xlvbd_device_free(disk); out: - up(&bd->bd_sem); bdput(bd); return ret; } @@ -421,13 +415,10 @@ static int xlvbd_device_update(struct lvdisk *ldisk, vdisk_t *disk) if ( !bd ) return -1; - down(&bd->bd_sem); - gd = get_gendisk(device, &unused); set_capacity(gd, disk->capacity); ldisk->capacity = disk->capacity; - up(&bd->bd_sem); bdput(bd); return 0; -- 2.30.2